@@ -9,12 +9,15 @@ from utils.page_utils import pagination |
||
| 9 | 9 |
|
| 10 | 10 |
|
| 11 | 11 |
def message_list_api(request): |
| 12 |
+ user_id = request.GET.get('user_id', '')
|
|
| 13 |
+ |
|
| 12 | 14 |
messages = UserMessageInfo.MESSAGE_TYPE_INFO |
| 13 | 15 |
|
| 14 | 16 |
final_messages = [] |
| 15 | 17 |
for message in messages: |
| 16 | 18 |
type_messages = UserMessageInfo.objects.filter( |
| 17 |
- msg_type=message['msg_type'] |
|
| 19 |
+ to_uid=user_id, |
|
| 20 |
+ msg_type=message['msg_type'], |
|
| 18 | 21 |
).order_by( |
| 19 | 22 |
'-updated_at' |
| 20 | 23 |
)[:settings.MESSAGE_NUM_PER_PAGE] |
@@ -32,11 +35,13 @@ def message_list_api(request): |
||
| 32 | 35 |
|
| 33 | 36 |
|
| 34 | 37 |
def message_type_list_api(request, msg_type): |
| 38 |
+ user_id = request.GET.get('user_id', '')
|
|
| 35 | 39 |
page = int(request.GET.get('page', 1))
|
| 36 | 40 |
num = int(request.GET.get('num', settings.MESSAGE_NUM_PER_PAGE))
|
| 37 | 41 |
|
| 38 | 42 |
type_messages = UserMessageInfo.objects.filter( |
| 39 |
- msg_type=msg_type |
|
| 43 |
+ to_uid=user_id, |
|
| 44 |
+ msg_type=msg_type, |
|
| 40 | 45 |
).order_by( |
| 41 | 46 |
'-updated_at' |
| 42 | 47 |
) |
@@ -55,9 +60,10 @@ def message_type_list_api(request, msg_type): |
||
| 55 | 60 |
|
| 56 | 61 |
def message_read_api(request): |
| 57 | 62 |
pk = int(request.GET.get('pk', -1))
|
| 63 |
+ user_id = request.GET.get('user_id', '')
|
|
| 58 | 64 |
|
| 59 | 65 |
try: |
| 60 |
- message = UserMessageInfo.objects.get(pk=pk) |
|
| 66 |
+ message = UserMessageInfo.objects.get(pk=pk, to_uid=user_id) |
|
| 61 | 67 |
except UserMessageInfo.DoesNotExist: |
| 62 | 68 |
return JsonResponse({
|
| 63 | 69 |
'status': 4091, |